remove unnecessarily duplication since types collapsed #40867
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
k8s-github-robot
added
size/L
|
[APPROVALNOTIFIER] This PR is NOT APPROVED The following people have approved this PR: deads2k Needs approval from an approver in each of these OWNERS Files: We suggest the following people: |
|
This change is |
sttts
reviewed
Feb 2, 2017
| @@ -413,27 +417,6 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) { | |||
| } | |||
| } | |||
|
|
|||
| // client-go and kuberenetes generated clients are incompatible because the runtime | |||
sttts
reviewed
Feb 2, 2017
| @@ -396,6 +396,10 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) { | |||
| if err != nil { | |||
| glog.Warningf("New kubeClient from clientConfig error: %v", err) | |||
| } | |||
| externalKubeClient, err = clientgoclientset.NewForConfig(clientConfig) | |||
| if err != nil { | |||
| glog.Warningf("New kubeClient from clientConfig error: %v", err) | |||
There was a problem hiding this comment.
It's not really something the admin will understand.
There was a problem hiding this comment.
It's not really something the admin will understand.
Prexisting from the original
|
Looks good. Only the warning text is not good. |
|
/release-note-none |
k8s-ci-robot
added
release-note-none
deads2k
added
approved
|
approved based on #40363 |
|
Automatic merge from submit-queue (batch tested with PRs 35782, 35831, 39279, 40853, 40867) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We collapsed duplicate types into client-go, so we get to clean this up.
@sttts as promised.